tools-libxl-prefix.diff

Patch-Name: tools-libxl-prefix.diff

Note: SMB: Added change for LIBEXEC_BIN for tools/xl/Makefile

Gbp-Pq: Topic prefix-abiname
Gbp-Pq: Name tools-libxl-prefix.diff

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index e3f376ade3da1c226b55f5e82b3678da29e8946b..032a8ae5ac292467d26285a4277c2509494eecc4 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -13,6 +13,9 @@ ifeq ($(CONFIG_Linux),y)
 LIBUUID_LIBS += -luuid
 endif
 
+LDFLAGS_XL = $(call LDFLAGS_RPATH,../lib)
+LDFLAGS_LIBXL = $(call LDFLAGS_RPATH)
+
 LIBXL_LIBS =
 LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(LDLIBS_libxentoolcore) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS)
 ifeq ($(CONFIG_LIBNL),y)
@@ -272,7 +275,7 @@ libxenlight.so: libxenlight-$(PACKAGE_VERSION).so
        $(SYMLINK_SHLIB) $< $@
 
 libxenlight-$(PACKAGE_VERSION).so: $(LIBXL_OBJS)
-       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(LDFLAGS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
 
 libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
        $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)

diff --git a/tools/xl/Makefile b/tools/xl/Makefile
index a5117ab3fb68b70a74a592e6c0917758ea3e11d8..845ea608aed81e11190ed0e32d36081c6f8a716c 100644 (file)
--- a/tools/xl/Makefile
+++ b/tools/xl/Makefile
@@ -41,15 +41,15 @@ xl: $(XL_OBJS)
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) $(DESTDIR)$(sbindir)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
-       $(INSTALL_PROG) xl $(DESTDIR)$(sbindir)
+       $(INSTALL_PROG) xl $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
 
 .PHONY: uninstall
 uninstall:
        rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
-       rm -f $(DESTDIR)$(sbindir)/xl
+       rm -f $(DESTDIR)$(LIBEXEC_BIN)/xl
 
 .PHONY: clean
 clean: